More fixes because of changing to multiple preferred categories.
Removed old API files