removed property name cleanup due to naming conflicts