Code refactor #1
Appshell code has has references to brackets removed where necessary.
Flagged various code for removal. Fixes #1