User:UBX/cleanup

E.g.
would make: