#35 Added uninstall hook and moved database clean-up there