Fixed deprecated UIViewController method use
Removed unnecessary header imports erroneously added in last change