Removed some commented out and unused code