Remove added constructors since not needed, fix javadocs