KAA-217: Remove unnecessary functions