Removes extraneous classes and simplifies testing