More template cleanup:
more template cleanup
Minor template cleanup + moved sectorscheduler out of the partitionservice
Minor improvements