Removes more (19/22)

Removes more