Removed moment dependency