Clean up custom sidebar query and registration