#9 Remove unused code from standalone version.