performance improvements
remove comments