Playing with conditional removal, cleaned UI