Smaller cleanup