get rid of compiler warnings / obsolete code