small fix
cleanup of bad code