Rebased app and cleared out working files