Removed a bunch of bizarre anti-scala, found by grepping for 'return'