#29 delete obsolete code, add code for remove picture