cleaning up programlistings (common)

Change-Id: Ia5dbe219b83dfb3ff2ebff12b0d1b3d8e1baf3ea
Merge "cleaning up programlistings (common)"