Started to simplify app to use as demo only