Clean up ABUtil usage