old cleanup I forgot to commit