Added docblocks
Removed obsolete function