Minor style/comments
Kill a few unused functions