just some cleanup of new changes and warnings