+ remove unused file
+ minor fix