clean up of ViewController to fix memory issues