Trimming those invalid paths finally.
Further cleanup