Fixed some issues associated with unsetting parameters and clearing them