Masquerade: Clean up the entire app's code for our current usage
8 files changed