tidy up. proxy still not working