Remove some dead code
Fix strict mode