Proper header licence on some class + removed unnecessary import.