Removed derelict code