Remove unused code
Fix docblock