trimming some unused code out