code cleanup, removed old commented lists