More updates to clean up client vs admin code.