Remove functionality for issue #29