Remove derelict code