Removed some disabled codes. Refs #8222.