NXBOOK-757 cleaned out chapter even more as suggested by Jason and Mike