Removed some commented functions
Removed old function