code clean
some unused code removed.