added remove_pv()

reorganized constants