cleaning up admin and model