Updating modal close icon and pruning unused code