Simplify setup code, trim lots of extra stuff.