Remove momemt dependency