Remove some variable and replace shovel .map