Removes more (18/22)

Removes more