Add files missed in last commit

ALso remove redundant import.