Clean up
Selected props