Some cleanup, color camera works