-MOAR code cleanup