direly necessary code cleanup