pruned out commented code