REMOVE logs and unnecessary code