More cleanup plus 404