Charon: Remove unnecessary functions