Clean up attributes util