Removed hasInit variable