code cleanup - removed skeletons