Added additional cleanup