Remove disused code