remove old spinner
Merging origin/jane/master-pending-imgs into master