Remove unneeded entry class