Removing issue 438 stuff