Couple small cleanup and dependency changes.
WIP on collection REST API. Read. Update and Delete.