More cleanup

Also new carousel image.