backout out unneeded stuff given the current state
Revert "Moved everything between the header and footer into"

This reverts commit 42c6cf4cf0e703df4ce10dd9cfb9bf5caf7c9a50.