Removes more (6/22)

Removes more