Removed unnecessary cludge