feature/remove-i-toggle