Fix a bug and some tweaks. Remove pic on postDelete