delete commented out code since new refactored classes work