Remove extraneous arguments
Inherit from more apt class