Fix old logging methods and general clean up of files