kadmin.local and code cleanup