Removed unused code and corrected docblocks.