Remove double references to User and Model