Removed old code left-overs, updated to newer Om version