remove unused functions
Fix paths