Cleanup on tracker behavior chapter