Removing that may cause issues. Instead of removing why not fix the failing cases?