Cleanup ot code