removing legacy scheme