Clean up hierarchy issues