Remove velocity, fix select inputs