Removed some init logic