Cleanup on latest working version