Removed some dead weight