Removed references to helper classes that were from a different branch.