Start cleaning up Rack internals