got rid of dead code
fixed mistake in last commit