early removal bugfix