remove unused assertions
fix cs
fix cs