The RegEx is also not needed anymore