Removing more dependencies from solver