m7: prop cleanup