cleaning up
exclude duplicate
fix