clean up model fields and queryset functions