Cleaned up NoPath