More cleanup, copyright notices