remove double import

Signed-off-by: Vandeuren Glenn <vandeurenglenn@gmail.com>
add missing elements

Signed-off-by: Vandeuren Glenn <vandeurenglenn@gmail.com>