Removing echo, time and die commands.