Removing all non-critical stuff from the basic example branch