Removed TODOs (added as Issues on GitHub), added cleanup for local tmpfiles