Code cleanup (removed some commented code)