fixed a MOAR big bug. shocked
updated regex collections
deprecated and so removed the model