Cleaning up some straggler

A few straggler filepath.Join, removed some superfluous code.