Removed unused variables
Updated cleanup and container forking scripts...