cleanup overlay and fix system.prop