Clean up some attributes