some leftover removed