Fix #6
Fix #7. Dummy output wasn't actually used by anything anymore, so I'm deleting it.