Removed some unused code -Teo