Fixed timestamp bug, removed superfluous timestamp function