rebundant code clean