Removed dependencies on CHERI