Remove unused constant
Remove unneded toplevel reference
Remove unused private method
Whitelist lambda call syntax for a while