Add javadocs
Remove some unnecessary convenience duplicates