removed some items I took from the previous branch that are no longer
needed