Even more cleanup of outdated stuff