Removes un-used code

I removed other nil blocks around the code...