refactoring and deleting some screens