Remove useless code, MAS-185