Cleaned up some old attributeType logic