moment: stop using deprecated api
Remove test draft