More cleanup, delete console logs