remove sysout
remove some warnings
remove todo