Added clean option