#4 more REST cleanup