remove trash
real half-way refactoring