cleaned up superfluous code