removed all them single runner classes