removed much commented-out code (such as former globals)