Tweaking documentation + removing unused functions