* progress
* clean solution and delete unused references