Code cleanup

* Baseline API
* Delete prepare script on run
* Purge excess code
* Update POT