Clean up of different types of clients.
Updates to Daemon and core