Structure Clean up