Optimizations/cleanup
Tests optimizations/cleanup