code cleanup. deleted unused/commented out line and classes