cleanup / camera added