Error Fixing

Removed some code that should have be cleaned up with the previous
commit