remove something unused, minor name change, minor addition