clean up; version advanced