Some clean-up and Rack setup