Codesniff cleanup for talk track model