Remove future feature code.