fix app to remove redundant logic