cleaning up models such that more fields are required