cleanup (removed old commented code)