remove attribute handling