Cleans up some dead code