Removed regex dependencies
Removed unused code, test crap
Restored plinq call