DB change, etc. cleanup