Removed useless code
MODA-214