clean up
moved more libs to gem