generating new reference images, removing some comments, cleanup etc