Done additional cleanup

Clean up and sync with original state of DbUp.