Cleanup and removal of more admin= parameters.