Updated to 3.0 and some cleanup