various cleanup for week 1 and 2