Cleanup additional functions