More cleanup of init files