Cleanup of c00ac08514c93edc88e556d40ac75a54eb40e271