Removed unnecessary blocks