deleted redundant parts