pulling out irrelevant code in app