cleaned up clint calls