Removed some dead code