removed redundant, unused code