Clean up disused code