Remove function and return fix

update, remove, create return false or 1