Removes more (17/22)

Removes more