Remove threadSafe annotations
Prepare mojo