Cleaning up uninitialized_xxx implementations