Removed some of the dead code