Removes more (8/22)

Removes more