Removed out-commented code