Ovikoodi working, cleanup