Remove function names--realized they weren't standard!