Removed useless
Fixed compiler warnings
Prepare for 1.7