Removing Timestamp metadata static class and builder method