remove unused class
change package