Revert "Updating listing code and some metadata"

This reverts commit c9f830a42d10cf77590aac2b81dba741cb7921cf.