Removed some code in the wrong place.