Added UNUSED_PARAM macro to these
Minor cleanups to some files