props cleanup