Removed some dead code
Fixed a few association_type values and removed some dead code