Removed now useless individual Item classes