general cleanup, first try on LeloRemote2