Script has been reported to causing build up of sub scripts that were not self deleted. Moving to 2 file solution.