Cleanup; remove a couple of proxy methods.