Remove everything that was obsolete
Merge pull request #50 from Yonom/CupCake-1.8-prepare

Remove everything that was obsolete