id some cleanup