Initial checkin after cleanup of global variables