cleanup ome code