More trival cleanup