Remove unneeded class construct