Some cleanup
Remove unnecessary application descriptor
Simplify application descriptor
Some more cleanup