Revert "Introducing Cake Pattern" :(

This reverts commit 1e014cedba9e1ed654b13faa7ca5306955aeb2f1.