Clean up and final commit