fixes #9 remove unused functions
removed todo