Clean some hopefully unused stuff