Removed redundant parts