Removed TODO note about init