Don't print full path
Don't use full path
cleanups