Fix bug with entities not having handler removed
Update gitignore