cleanup a bit, try and get gates working again