more crud removed