Refactoring / Can only delete when logged in