Refs #3454 - Remove use of useless classes