Removing functions, migrating to Risk