Get rid of Log.h, .cpp