more better (removed unused elements)