Remove test code and switched segue type to modal