Remove support for finish_initialize