image updates
Revert "update & cleanup"

This reverts commit c67af3c637a14add017b79351aa418c6c772fcee.