VP-152 Added docblocks, removed useless code