Removed unused code segments