props: move to system.prop and general cleanup