cleaning up packages and references