Code cleanup, now include Config.h for time info