Undo changes

Removed the code that caused an exception