Some more EP removals
Did some corrections in build_pick_string (file osxicon.cpp)