removed unused props, used prop in java version