Cleanup and added old libraries