Added comments and removed unused module _marketplace_