Fixed associations and removed unused model