Removed even more old stuff...