Removed deprecated files (issue #2592, issue #2593)