Removing EventNameUsed check and utilities file