Removed some unnecessary blocks.