removed hard-coded pickup