remove trash and fix bug