Clean up attributes