removing unused code *waves happily*