First little cleanup round