fix moment and delete old references