remove old generator implementation and fix logged out generator bug