Initial clean in preparation for v2.0