Removing old implementation