Moved over the dead code