Refactoring: remove now works; bugs still expected throughout