Removes more (14/22)

Removes more