Merge "Remove stub since proper deletate is implemented"