took out a ton of unused code