Removed some temp file creations