Remove dependency on specific content