Removed some more legacy files