commenting out old code (some of which conflicts with external libraries)