[UNSTABLE] cleanup and optimization
[UNSTABLE] cleanup and optimization