remove chapter 5 patch again
remove -N patch switch
some cleanups