removed remnants of the old implementation