Small refactoring to remove old code
Merge branch 'master' of https://github.com/Leakedbits/Codelabs.git