Make variables more verbose
Remove unneeded files
PR Changes