Remove unnecessary log and as many warnings as possible