removed ununsed stuff

and warnings too