Cleanup old code in DesignManager