Clean up code; updated vendors