-Removed unused code
-Cleanup