Reverted changes before wunderlist changes

most of the commits before the wunderlist changes started are reverted
(I guess, still not sure )so that it can be started once more.