clean space names
add delete function