shorts - Clean Up