Removed old libraries code and updated dependent files