trim helper files and usage down