cleanup imports

Signed-off-by: Steven Armstrong <steven.armstrong@inf.ethz.ch>