* Cleanup of code.
* Make sure copy is made from rest.php and export.php