Removes more (22/22)

Removes more