Remove clint dependency