property bugs cleanup