rebased on upstream

- remove file that should not be in git in the first place