Remove unneeded typesets
Add missing camera defines