removed ROS_BUILT_TYPE which is unrecommended. Also removed a few redundant lines