Removing unnecessary init calls