Removed all references to pwd