more cleanup, now compiles without any warnings