HHH-8884 : Made this only remove "and " and " and"

Made this only remove "and " and " and" as otherwise tables named "android" end up being queried as "roid".
(cherry picked from commit 84b032da1df4260d1f80ce48d8ad7907146a8030)