Cleanup & Threadsafety
Cleanup
Refactoring
Update deprecated calls