Removed unneeded file.
Merge branch 'master' into review