n7100: remove files added during last merge