added missing copyright and removed some cruft