more cleanup. removed all get_attributes and related methods