removing unecessary classes

Signed-off-by: Daniel Newns <dan@higgsdesign.com>