Improved remove images