Cleaned up client