add replacement for - with _
remove debug code