fix few warnings
 remove unused variables