Cleaning up feedback implementation.