Removed commented code for cleanup
Fixing some merge problems