Removed more nooby dead code