Refactoring RemoveBlock