More camera setup related clean up