fixed expression
removed probably unneeded tasks