rm dud code
some code cleanup
....probably should chain that emit.