Removing ResourceProxy Infrastructure For #216