Cleaning up
More proxy fun