Some cleaning

Hopefully I did not break anything.