Cleanup, and added apache httpclient lib