code sanity and cleanup (removing large blocks of old commented code)