Revert "More cleanup"

This reverts commit c9ecc29b789840d4e702961181c9b5abcc956f36.
Revert "301 Redirect"

This reverts commit f21bcb0f362ee09c31d22e5f226344981bf4b5aa.