NotFound cum-clean-up