Removes more (21/22)

Removes more