Added owner removal check