BEIJING -- The top legislature Saturday voted to abolish the "custody and education" system, a penalty reserved for law violations related to prostitution.

The decision was passed at the end of a six-day bimonthly session of the National People's Congress Standing Committee.

The decision will go into effect Sunday.

The "custody and education" punishments imposed before the abolition shall stay valid. After the abolition, those who are undergoing "custody and education" shall be discharged from the penalty without serving the remaining time, according to the decision.

The "custody and education" system was abolished, but prostitution is still illegal under the law on penalties for the administration of public security.

The Criminal Law also stipulates the crimes and penalties for organizing and forcing prostitution.

The "custody and education" system has played an important role in maintaining a good social atmosphere and public order since its introduction more than 20 years ago.

The "custody and education" measures have been less applied in practice as China's legal system keeps improving and the law-based governance advances.