Remove more unnecessary code [MJ-755]