Cleaned up jumpstart client support