remove trash
fix bug