77: Removed some unused code from last commit