Remove debug code. Close #143