clean up models and remove dup