Remove unused standard feature code