getting rid of unwanted 'mock' classes and scheduler fixes