Removed forced toolkit choice