deleted a bunch of redundant code