Remove function blah blah i'm squashing