More Cleanup of Appdelegate