Remove debug msg and change message to line