Better ignore and cleanup.
Improved uninit
Uninit now cleans up nicely.