Remove execute_free* functions
Small fixes