Uses presentViewController to navigate, cleanup unused code