Catch up with the latest functionality
Remove fragile path code