-Cleanup: simplify some more :p