Moved removal feature to separate file