Revert "Finish search + lyrics update"

This reverts commit 9701b61c58f33ad7493c8ad658b88fcbdbd99c46.