Deal with package removal. Close #1