Cleanup attributes