Got rid of deprecated instructions