Removed some dead-code.