Removed redundant configuration blocks