Leo: Remove duplicated sources (my fault), update camerawrapper