Update copyrights and more cleanup