Janitor cleaning up

Clipped by Saebjorn80