Console code cleaned