Refactored app removal