remove unneeded null check
remove unused imports and update copyright date