Cleanup to the images and drawer