removed old way of doing things in AVF