Add small cleanup