cleanup -- remove unused packages and other fixes