clean up for Hybrid