Cleanup
started work on central proxy