Fix nullpointer, remove imports & update version