- cleanup, NPE fix