Remove undefined param due to conflict with closure compiler
Merge misc_cleanup