EJPLUGIN-157; cleanup code