removing legacy implementation