cleanup and remove of compiler warnings