Some unused code removed.