Remove issue #14 implementation