Removed redundant file from 2.x merge.