app delegate cleanup
fixed merge issue