Remove function check