More cleanup and fixed bad version number