feedback API conformance
feedback API conformance and clean up