removed extraneous function and renamed primary interface