Add build.prop tweaks and clean up