remove two unused part