Cleaning up the notFound support