Rest Resource cleanups
removed todo