cleanup of filed from the fork process
Changes to the build system to facilitate the fork