Remove file that was introduced accidentally

Signed-off-by: Abhijit Hiremagalur <abhi@pivotallabs.com>
Auto-merge remote-tracking branch 'upstream/master'