Useful input/removals refactoring