Remove cruft.
Also shuffle library
Show the library before asking for a choice.