Removing reference to Core from (most) REST resources and StreamRouter