Remove more stuff + added the mm-qcamera-daemon back