Removed redundant slot classes