[refac] remove clutter