addresses model removed & columns added to users and propspect_users

I also delete the has_many and belongs_to information