Remove constant class - make safety internal.