-Clean out dead code