Updated version and final cleanup