Removed duplicate class defs