Application startup tested
Remove unised code