Code cleanup - removed some commented out code