Fixed task un-completion and took out useless stuff