Eliminate need for client console script