Removed undefined timestamp usage