Turn off un-used code to simplify codebase. Minor tidy-ups
App functional with new JSON