Replace depracated pattern with path
Remove commented out code