Deleted some out-commented test stuff