Fix docblocks
Remove old stubs