Updated version and setup cleanup