Remove depreacted finders

They were deprecated in 4.0, planned to remove in 4.1