Removed couple more redundant parts