remove marketplace and improve commenting