fix bug
fix bug
remove unused stuff