Remove old implementation(!)
Fix use of changed return value