Delete unused logic, prepare app to new logic implementation
Delete unused logic, prepare app to new logic implementation