Removed call to clean_nth_plugin
Removed unused var
Added expression struct