(Lakka) Some cleanups