Removes more (12/22)

Removes more