cleanup of old code