Cleanup rest/crud in review