Include additional cleanup