Cleanup init #2