Removed remnants of the no touch crap.