Remove rename of trigger function

This was a half-baked changed that got accidentally commited. Removing
it!
Remove SQL functions on clean
Fix column name in upgrade file

Part of #421
Remove old function

Function has been removed.. so we remove the old one.