added erase
cleanup rebuild
cleanup