import cleanup and manual tracker usage