Removed what seem to be useless kludges