Add metro select
Remove unneeded parameters.