Remove and correct Debug Messages