Fix last commit
Get rid of more dead code