remove old copyright, shorter imports