Cleanup: remove 2nd display, runtime

Change-Id: Ic13070c1d3f8174044f268af0c323cf65b187c54