Cleanup parameters
Merge branch 'master' of github.com:rbayliss/OpsCopterDB