Removed redundant code (replaced by libaries, should fix #5934).