fix imports and cleanup OnionCell