Cleanup additional code