Cleaned up TODOs in Rest Dispatch