removed duplicates in src and unused