Remove unneeded variables and hardcoded path as suggested by sthen