Clean up dirty initilizer merge