Some cleanup, moving remote to arduino