Clean up in main
Merge branch 'master' of https://github.com/benjambj/TFE4140