Props Clean up