Remove os.getcwd calling
Remove some information from kwargs