Updated to clean up references to unused class.