Merge "Remove undocumented functionality from init." into nyc-dev