Removes more (13/22)

Removes more