Clear out dead code please