Removes more (16/22)

Removes more