Removed redundant classes, sorry @SeamusFD