Remove function
Remove unnecessary code