Commented out tmp file creation for now