Clean up of outdated stuff