Cleanup docCode to run in single solution