#4 stripping out REST from ch1-4
#4 more REST cleanup
Merge branch 'rest-removal'