cleaning up A7