Remove code from another ticket [MJ-601]