Comment out 404s, code cleanup