Removes more (15/22)

Removes more