Remove vestigial file
Remove unnecessary local vars