Clean up time stamps and debug output code