Remove unused variables and old MHD penalty routines.