trivial updates, delete unused files