Clean up class properties