cleaned up some superfluous code