removing old, unused code