trying to clean up admin a bit