Rmeove libril, add missing camera include, clean up some stuff