code cleanup - undefined classes