fix #11 and delete tests and comments