Removed CRUFT code