remove raven and skylight and fix ga partial