Revert "Used ImmutableList to prevent Collection modified exception"

This reverts commit dfce0de0c5bded55e61d3744582fda09fcb7cf95.
Used ImmutableList to prevent Collection modified exception