Removed redundant components