Merge "Remove create_timestamp & get_timestamp methods"