Removed some unused blocks