Avoid NPE and remove obsolete module dep