some additional cleanup