Removed a few redundant parts