More cleanup. Simplified the relay code exposeing only On, Off and State functions now