add missing libs
remove commented code