Remove API that has been replaced by subsystems

Remove API that has been replaced by subsystems - revert some classes for now