There may be some rake tasks that depend on these two. Those will need some rescue statements in due course.