NPE Fix
Removing unused and deprecated methods
Adding Documentation