Fix nullpointer, remove unused window feature