Removing Haste dependency