commented out removal of images; cleanup