Cleanup, stable build