Clean-up

Hopefully it doesn't cause problems.