clean up and new main version