Class property cleanup