Updated to have a cleanup cycle as well.