updated c5, minor adjustment to removeBuffType