Further improved database cleanup
v0.1.11 Release