Refactor, clean
Remove assert that just did not work