Merge "init: clean up file / socket descriptor creation"