Clean up marker types and Unsafe initialization