Added image selection step plus cleanup