Removed more legacy files