Application: Remove hardcoding and add deconstructor