remove a few unused things