Some more cleanup

We removed duplicate configs, and also system.prop tweaks, they are now inside the system.prop file