removes old requirement classes and fixes imports