[PATCH 18/20] Remove no longer needed requires