cleanup
fix init to null