Delete unused files
Add asserts