Updates for advanced search and removal of unused functions.