Cleanup
janitorial - removing unneeded includes
Start of simple client for testing