Clean up a bunch of dockerstart parameters
Eliminate a couple more variables