Very little cleanup. Seeing if remote is remembered.