Removed unused code passages