Cleanup

* Remove unneeded function
* Remove extra fold marker