Cleanup, the return is already a boolean