(Lakka) More cleanups