Removed extra code that caused errors