Fix version number and cleanup