Removed unecessary stuff from handlers and tasks.