removing old implementation