removed redundant parts