cleanup / add CompleteParser