Removed unnecessary pickle specific function as we do not use it.
Fixed todo added error handling
Removed irrelevant, deprecated , solved TODO tags