More REST cleanup (#4)