Better docblock
Removed dead code