trim out old code