Remove even more recursive requires