Striplined the code and deleted unused DLL