Clean up constructions