Removes more (7/22)

Removes more