Cleaned up some of the RCC code and build