Clean up auto-properties